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