Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2064127 Change-Id: Iec813ee718cda4e6d0bd5a32ec6a2af9a136cfaa Ignore-AOSP-First: this is an automerge Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>