Merge changes from topics "634d4559-873d-43f0-ba3c-76a20380ae8f",...

Merge changes from topics "634d4559-873d-43f0-ba3c-76a20380ae8f", "fc3d5ff8-8b95-47be-92b2-a628b6ea8b83" into main am: d4a60ea9

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



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