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