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