DO NOT MERGE - Merge ab/7272582 am: b0a5f9b660 am: 72f85e9639

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

Change-Id: Iac6689ca06cb524133d0f880b61b56ea21df5261