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