DO NOT MERGE - Merge ab/7272582 am: b0a5f9b660

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

Change-Id: I0fa312b8e2244fc2e089622be0b830e29c43022c