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