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