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