[automerger skipped] Merge "[DO NOT MERGE] am: 16eff988" into sc-qpr1-dev-plus-aosp am: 63756dbf -s ours

am skip reason: subject contains skip directive

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

Change-Id: If059562405546f2bdf8ddd57be19642bc694a7c9