Merge "Merge QQ3A.200805.001" am: 4b3c00e75f

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

Change-Id: I12420dd6aa080e632f4e3b2748b4970450a4ee72