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