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