[automerger skipped] Merge Android 12L am: 62a34ff6 -s ours am: f08db68a...

[automerger skipped] Merge Android 12L am: 62a34ff6 -s ours am: f08db68a -s ours am: 63db12dd -s ours

am skip reason: Merged-In I367438214a7649cade2396b48ed3efb14b564075 with SHA-1 a05fb400 is already in history

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

Change-Id: Ibc20b0e26841c5b97cfa381e94b3ef374d066beb