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