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