[automerger skipped] [DO NOT MERGE] am: 16eff988ab -s ours

am skip reason: subject contains skip directive

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

Change-Id: Ibe333dd922409f551431d3a16d603c853aafd6f4