[automerger skipped] Merge "Merge android10-qpr3-release to aosp-master - DO...

[automerger skipped] Merge "Merge android10-qpr3-release to aosp-master - DO NOT MERGE" am: ce0136d5 am: 01459456 -s ours am: cf29a074 am: 0ee93e11

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

Change-Id: I2c9654ec2b8a9e72992cdaf26d1293a8f15101d7