[automerger skipped] Merge changes from topic "cherrypicker-L99000000961168479:N91800001376948752" into udc-mainline-prod am: 9ead6b6555
-s ours
am skip reason: Merged-In I42b8c0ddad8822a0a329e99ec4ec62f8c3546ee9 with SHA-1 6d65a0fc3d
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/23622295
Change-Id: I59ed9a33c1ab85304c7792ff5b9eda9b8c64998c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: