[automerger skipped] Merge ab/7061308 into stage. am: d38016f885 -s ours am: ca76721c0c -s ours

am skip reason: Change-Id Iddfc1d7b0f3fbc45f1ccaa6d6d3e075adca93864 with SHA-1 716f26458d is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2c8b751b7dee50e4fb3bc3f5bee7348b77d4c69d