[automerger skipped] Merge mainline-release 6664920 to stage-aosp-master - DO...

[automerger skipped] Merge mainline-release 6664920 to stage-aosp-master - DO NOT MERGE am: c9fae4d8 -s ours am: 46cde307 -s ours am: fe8f27e5 -s ours am: 76798cd5 -s ours

am skip reason: subject contains skip directive

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

Change-Id: Idc33ab6eefb6f2830bc1535088200d2f6d824ddf