tree 9c30a735dcf582b3da4cd815d7373da1e28b3769
parent 5e92b84e111bd6c0f7ba1360dc02ab1ace6267e1
parent ee7b5630f7344030e80cf28c55be0d4bbbc7c3ae
author Xin Li <delphij@google.com> 1633681786 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1633681786 +0000

[automerger skipped] Merge "Merge Android 12" am: d2d37213cd -s ours am: 69902c2b9a -s ours am: cf5fa4be49 -s ours am: ee7b5630f7 -s ours

am skip reason: Merged-In I1f60cd434a6cda1c1039dd05f3690d9dcc65f7e2 with SHA-1 ea1b825f58 is already in history

Original change: https://android-review.googlesource.com/c/platform/hardware/qcom/audio/+/1847607

Change-Id: Ibbcd4c407d5f8782ae9651b5d5c73f70e4d8c8c8