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