[automerger skipped] Empty merge of sc-v2-dev-plus-aosp-without-vendor@8084891 am: 61bf563f1d -s ours

am skip reason: Merged-In I0e91024c49ccc9804d35b0392b8680d9a5b25648 with SHA-1 f84a88a2e4 is already in history

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

Change-Id: I5610d14a71d6b2848e829578ba5bd28922a228f8