[automerger skipped] Merge changes I22a32a3a,I7b5b5941,Ic8a1976e,I79f480bf,I5a29eb8d, ... am: a884af18d0 am: f0ddfb0b02 am: 19a5d55fb3 -s ours

am skip reason: Change-Id I22a32a3aab02e56af1e6ae901de65e86a94d6196 with SHA-1 858abf6603 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I52a2a2d816bc988d7c9cda9d7a954a1da4c1b687