Merge "Android W -> B" into main am: 53fbd94d34

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

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