[automerger skipped] Merge "DO NOT MERGE - Merge RQ2A.210505.003." am: 7e8f5aca am: 8c84477a -s ours am: d13156d8 -s ours

am skip reason: subject contains skip directive

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

Change-Id: Ie66323fe2c9c5903b5da7bb152b854ec09a9be08