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