[automerger skipped] Merge tm-dev-plus-aosp-without-vendor@8763363 am: 9e1a4fbc22 -s ours am: 6905d86cc8 -s ours am: 50e7542b5d -s ours

am skip reason: Merged-In I20cbc048dc40c2e770e2c9942ce03add6aee70fb with SHA-1 a0cab9cebc is already in history

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

Change-Id: I47447aee5418f907e5d82709d20c3d2623f6bff1
Signed-off-by: Automerger Merge Worker <[email protected]>