[automerger skipped] Merge changes from topic "am-5945f34d83bd47e39e93546db3757d9d" into main am: eb2dc1c5 -s ours am: 636747e2 -s ours

am skip reason: Merged-In I551e14fa6a0c63e3cef334b953f670cf9c465e10 with SHA-1 36981b54 is already in history

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



Change-Id: Ibdb16b8015269070b244cd69ff922908576eb6fe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>