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