Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23545057 Change-Id: I8d65342899d69e875b725a638317162f5f38c9a8 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>