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