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