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