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