[automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: c485abe2e8 -s ours

am skip reason: Merged-In Icef11a6322992e3615e411d95ded3f76c24adf17 with SHA-1 e61cc62880 is already in history

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

Change-Id: I30933be7cc8d3841a69c6168061fc7ef895f80c6