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