[automerger skipped] Merge android10-qpr3-release to aosp-master - DO NOT MERGE am: a4d40c35 am: 36039bea -s ours am: 7f29f655 am: 4fb158f7

Original change: https://android-review.googlesource.com/c/platform/build/+/1356542

Change-Id: I8a2e8722f1aefd69f4961d5d83d9bd194867d195