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