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