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

am skip reason: subject contains skip directive

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

Change-Id: If91980a606030c7c842f0ac4f348292b261ea08b