tree 0213d29d2cb79c10b54a7eb403936473236858be
parent be92b23020a8b7e6e5c501ab7374178e4b34089d
parent 3374ee2f406bb3a1d5ac45c88e57a394bf1a823b
author Colin Cross <ccross@android.com> 1680193755 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1680193755 +0000

Merge changes I93da03b1,I5fb3ee29 am: 3f3320cb1c am: 3374ee2f40

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

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