[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 skip reason: subject contains skip directive

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

Change-Id: I9b8929443ee3971f7c9c7b20d0fe455e74da0365