[automerger skipped] Merge "Android W -> B" into main am: 53fbd94d34 am: 2c7bba173e -s ours

am skip reason: Merged-In I4d057695a2d9f7b443e645a42af29e8e8f09329d with SHA-1 881cf5d584 is already in history

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

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