[automerger skipped] Merge remote-tracking branch 'remotes/goog/stage-aosp-master' into am: 6739ee51da -s ours

am skip reason: Merged-In If3f8921d932bf7d680ab6ef9002505c2f7b47f6c with SHA-1 4c7b4979b6 is already in history

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

Change-Id: Id8d143b29f503f2ddf9509de92868f58db6f2991