Merge changes from topic "unwanted-transitive-deps" into main am: 26464230...

Merge changes from topic "unwanted-transitive-deps" into main am: 26464230 am: 7e23a551 am: ac32baa1

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



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