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

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

Change-Id: Id051a643895979433328e74deb5aa16dbcd573b6