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

[automerger skipped] Merge "Merge QQ3A.200605.002 into master" am: d7785982ac -s ours am: 9dcb6b24 -s ours am: d9a65715 -s ours am: 752eb926 -s ours

am skip reason: Change-Id I5e28537689d1a53e99f91eafd494eb3a0c890f46 with SHA-1 afbf77813b is in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1323623

Change-Id: Id2777f3b97ff4733dfda185b8feceb4cc25330bc