[automerger skipped] [automerge] [DO NOT MERGE] 2p: 0449bb97fa am: 032007da30 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I5d7a4d12b0ddd788f0c1ffeecd98abdf3c0904cb