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