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