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