[automerger skipped] Merge Android 12 am: 43866e9b9d -s ours am: ec67d2018b -s ours

am skip reason: Merged-In I3f9ffb1d2b3f37a61c69c8e34ccc0b8fc9dc9668 with SHA-1 e05907e367 is already in history

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

Change-Id: I1a0fc8f845c4e6af5df3ac5916769bc3f42fff46