[automerger skipped] Merge "Merge QQ3A.200605.002 into master" am: 64d23309...

[automerger skipped] Merge "Merge QQ3A.200605.002 into master" am: 64d23309 -s ours am: 71f9ff25 -s ours am: 0bf4f271 -s ours am: 478b4df6 -s ours

am skip reason: Change-Id I614914b738e3af198fe21b881d2e475e2e8eda41 with SHA-1 cbebca98 is in history

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

Change-Id: If41ba232497c0aaf7fbe5496b09ba7b4a4905e15