[automerger skipped] Merge "DO NOT MERGE - Merge Android 13" am: 18c97f16a4 -s ours am: df07ea3ad1 -s ours

am skip reason: Merged-In I4e1d0185c8a81505b6d5065daf41c780cd376985 with SHA-1 d30e814c58 is already in history

Original change: https://android-review.googlesource.com/c/platform/external/tinyalsa/+/2186712

Change-Id: Ia0c1220b7bc93de7d2674feabf475d92ea4d261d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>