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