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

am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ibfd1b118da8409868076a0551804ff1a3c913fa2