Merge "Address comments from aosp/2777928" into main am: 379257c8 am:...

Merge "Address comments from aosp/2777928" into main am: 379257c8 am: f8b4e598 am: a494870a am: 28698644 am: 25f45dba

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



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