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