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