tree c449a4bccc40033a74bb528845225119b7aeb64b
parent 02c857bdd07204603aae872742ec334fe4ead1e0
parent 49753eca77e2b75509835ea0bf80125fdcf96460
author Treehugger Robot <treehugger-gerrit@google.com> 1635794416 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1635794416 +0000

Merge changes I346ac9c0,I57352aa0 am: 57be76d9ac am: 061abc7259 am: 49753eca77

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

Change-Id: I0df294128a7789684481055fe18b7b6d3e38b416