[automerger skipped] Merge Android 12 am: 43866e9b9d -s ours am: ec67d2018b -s ours am: b38ea2600a -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: I7afc7f4b245f9b36ec5b340ec8b14fc3f9d3ab93