Merge changes I66b09cd4,I1847ab2b into main am: a43c06e5

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



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