[automerger skipped] Merge "Merge sc-qpr1 to aosp-master - DO NOT MERGE" am: 1ebd070c8d -s ours am: 0e8235cbfe -s ours

am skip reason: subject contains skip directive

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

Change-Id: Ic64f2f5081c007cd18a0e3da38e64def3aabbbaa