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