[automerger skipped] Merge rvc-qpr-dev-plus-aosp-without-vendor@6881855 am: 22e6840546 -s ours am: 9c3b851771 -s ours

am skip reason: Change-Id Ib951d1a8f55a514f77d015fec8c3cbc1809760d5 with SHA-1 0edb97b507 is in history

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

Change-Id: Id4b73da8e68ea69ffd355a10ccdae2b4937aed4c