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

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



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