[automerger skipped] Merge "Merge RQ1A.210205.004 to aosp-master - DO NOT MERGE" am: 0e0360963a -s ours am: 21cea68a24 -s ours am: 573a375a5a -s ours

am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I34dda9fbcb9c5a75df2d97f31e21a88409a9c5a2