tree b7d225876789f4b3f812b90a80357ee81b1ba590
parent 8dc7784a9f446843a9fb23ee1924f751cacb3313
parent 4dcc4aece00bcfdaf32d6305e8b160f5b96c5a73
author Colin Cross <ccross@android.com> 1646845451 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1646845451 +0000

Merge changes Iac0f4ca9,I4a56efb2 am: ce73506a85 am: 6d21a821d1 am: 4dcc4aece0

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

Change-Id: I814cd0807409721ce057c39cb6daf9b8a1c31d15