[automerger skipped] Merge "Merge android10-qpr3-release to aosp-master - DO NOT MERGE" am: ce0136d557 am: 0145945639 -s ours am: cf29a074ac am: 0ee93e11c8 am: c9101d1249 -s ours

am skip reason: subject contains skip directive

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

Change-Id: Ife35f867547bd335a6d71839377c0ede735c5780