[automerger skipped] Merge "Merge SQ1A.220205.002" am: c45b4ab9 am:...

[automerger skipped] Merge "Merge SQ1A.220205.002" am: c45b4ab9 am: 428e9e63 -s ours am: b3789526 -s ours

am skip reason: Merged-In Ia9dc251c853526b2ce66c9f8ff595d496b7f1bc4 with SHA-1 fca5cb37 is already in history

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

Change-Id: I13fa5da1028bb250308137d020406178092c0182