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