tree 0ffef1012dfebf8af3acf0ad88dc9aadd8e5a3fe
parent 6d0fd28955f0cb28b844f615127a53bb7cfa93c8
parent 79a6b9586b66425a77bac0056a18a66dace57e0a
author Xin Li <delphij@google.com> 1614816722 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1614816722 +0000

[automerger skipped] Merge RQ2A.210305.007 am: e21d3d9247 -s ours am: 358976caaa -s ours am: 79a6b9586b -s ours

am skip reason: Change-Id I0bcb339f01c664e59e258daf901460523b84c468 with SHA-1 d38016f885 is in history

Original change: https://android-review.googlesource.com/c/platform/hardware/knowles/athletico/sound_trigger_hal/+/1613216

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I033a76f2c7943b0021399f14f4864f897c4a7732