Merge changes from topic "am-f9ee56e6607943ff8ca5de5609d46463" into main am: c067bcb1

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



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