[automerger skipped] Merge SQ1A.220105.002 to stage-aosp-master - DO NOT MERGE...

[automerger skipped] Merge SQ1A.220105.002 to stage-aosp-master - DO NOT MERGE am: ea1249b8 -s ours am: 9400843a -s ours

am skip reason: subject contains skip directive

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

Change-Id: Ic33a2e4aead117ffd3a2b05146bd68744aaa3733