[automerger skipped] Merge "Merge sc-qpr1 to aosp-master - DO NOT MERGE" am:...

[automerger skipped] Merge "Merge sc-qpr1 to aosp-master - DO NOT MERGE" am: 1ebd070c -s ours am: 0e8235cb -s ours am: ac95deb6 -s ours am: 7c059cbe -s ours

am skip reason: subject contains skip directive

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

Change-Id: I89e1c184baeb4d35a601fee88673b54f6250d31e