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