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