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