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

Merge changes from topic "unwanted-transitive-deps" into main am: 26464230 am: 75136bde am: 8f4073fa

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



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