[automerger skipped] Merge mainline-release 6664920 to stage-aosp-master - DO NOT MERGE am: c9fae4d80e -s ours

am skip reason: Change-Id I5c0fe4b0b3be7191d42db14195791d8a8bee503c with SHA-1 91286c4ec9 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12579472

Change-Id: Icfb9e9a3074558ecbfb6f2a41c8b0cf0da133dc5