[automerger skipped] DO NOT MERGE - Merge Android R QPR1 am: 6530472021 -s ours am: d82ab77782 -s ours

am skip reason: Change-Id I47caff651827119801e9151b9a4954061f169553 with SHA-1 22e6840546 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iddfc1d7b0f3fbc45f1ccaa6d6d3e075adca93864