Merge changes from topic "b/215723302" am: 66e6466e am: 4ed4ace5 am:...

Merge changes from topic "b/215723302" am: 66e6466e am: 4ed4ace5 am: 3f8e0c48 am: 562477b1 am: 599c1dd7

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



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