[automerger skipped] resolve merge conflicts of...

[automerger skipped] resolve merge conflicts of 602859b1 to mainline-prod am: a2734a4d -s ours

am skip reason: Change-Id I988381f4f72061f7c6eb99d58593f92cfd618b1b with SHA-1 73bcc38a is in history

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

Change-Id: I31750dd0497334b98c936a54feb2604e3ccbbec3