Merge changes I7bc4d8d4,I8158c0b9 into main am: 9ae2999dab am: b98b24b053

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

Change-Id: I68676ace44903a0eab5394831f1efa5bc8db40eb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2023-11-02 00:44:26 +00:00
committed by Automerger Merge Worker

Diff Content Not Available