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