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