[automerger skipped] Empty merge of sc-v2-dev-plus-aosp-without-vendor@8084891 am: a793b8970c -s ours am: 473f598fe4 -s ours

am skip reason: Merged-In I5b488fa5e435e94b7a62b81bdc543d8126520e5d with SHA-1 ca8a099a26 is already in history

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

Change-Id: I4571d34202e66e21ee699fd81cc23bc20b74db1a