Merge changes from topic "roboleaf-busy-beavers-wmediumd" am: eefac275

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



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