[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

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

Change-Id: I3cfd1a5c6ff94f65e695109e0299fd932242782f