[automerger skipped] Merge android10-qpr3-release to aosp-master - DO NOT MERGE am: 73a7dc4fed am: a82001555e -s ours

am skip reason: subject contains skip directive

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

Change-Id: Id24c05de925226bd59c27ff042d7536c7dab8961