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