Merge changes Ib785bd1c,Icd05ee3a into main am: 340a2b8d3f
am: d90c2f8b0f
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2853087 Change-Id: Ie22dedba5ec0048548606f3214e47e960152471f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: