Merge changes from topic "am-3d034d7a464a4106aaa9c7151c240144" into...

Merge changes from topic "am-3d034d7a464a4106aaa9c7151c240144" into rvc-d1-dev-plus-aosp am: c65ec1aa am: d89bfc30

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

Change-Id: I946bf5dd78875f6140e2f56e1bb309f7671f8bff