[automerger skipped] DO NOT MERGE am: 9441c0ccaa -s ours

am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/device/google/crosshatch/+/12037152

Change-Id: I2bff0eec58eba0d9e91de79b0197a6b0eb56fa9c