[automerger skipped] Merge "resolve merge conflicts of e32b384719
to rvc-dev" into rvc-dev am: 7790f714d5
am: b0c70846ae
am: 3f905b3871
-s ours
am skip reason: Change-Id I3e5d64f948ae43c5dda60de1d4a52b187e36dff8 with SHA-1 af7b75b8db
is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/12851151
Change-Id: I10e48d69dd2f1cd1c66ed4ffc421aac5e508bea2
This commit is contained in: