[automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: e05907e367 -s ours am: 2b6b28f2fc -s ours

am skip reason: Merged-In Iac6689ca06cb524133d0f880b61b56ea21df5261 with SHA-1 8d468c1755 is already in history

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

Change-Id: I00ca56937a1bdfe7e95000bdac964b37154e8355