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