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

[automerger skipped] Merge android10-qpr3-release to aosp-master - DO NOT MERGE am: 73a7dc4f am: a8200155 -s ours am: c277e80b am: dd4921b9 am: ed25061d -s ours

am skip reason: subject contains skip directive

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

Change-Id: I7f7d6457a6c52afab2da944de69be1637787e826