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