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