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