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