[automerger skipped] Merge "Merge RQ2A.210305.007" am: 6b94f5ac -s ours am:...

[automerger skipped] Merge "Merge RQ2A.210305.007" am: 6b94f5ac -s ours am: 60b92f8e -s ours am: 69d7e7f3 -s ours

am skip reason: Change-Id I12e20519ac29f802f9983dcf27f313388b33829c with SHA-1 9059706e is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I49409ce7842b4187aa01fcaee23f876bc938faf4