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