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

[automerger skipped] Merge "Merge QQ3A.200605.002 into master" am: e3e5b30b -s ours am: 1c4ff813 -s ours

am skip reason: Change-Id Iea2c5fb12ea7b1ad563f540349063fcda557fbc1 with SHA-1 560de158 is in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1323615

Change-Id: I34d2b4f02849919710afb1f76e44393a32aae6d2