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