[automerger skipped] Merge "Merge QQ3A.200805.001" am: 4b3c00e7 am:...

[automerger skipped] Merge "Merge QQ3A.200805.001" am: 4b3c00e7 am: 4939ba29 -s ours am: 955e04a8 -s ours am: 7f35d6cc -s ours

am skip reason: Change-Id I6e0bdc8c02bab54f6278096b3a3acadd97c064c6 with SHA-1 9450069d is in history

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

Change-Id: I3b216c05edfa0cca636019b5aaa8b1aa7572b274