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