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