[automerger skipped] Merge "Merge Android U (ab/10368041)" into aosp-main-future am: a4479de778
-s ours
am skip reason: Merged-In I0a83d1213dde818cfa6a04e51ddeb2056fb7f87a with SHA-1 536349e466
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/24181668
Change-Id: I5ccebb96f13cccba1e6e4ae67f7897e3160b3fbf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: