[automerger skipped] Merge Android R am: 373609b119 -s ours am: 3317d12f31 -s ours am: 6339ed1049 -s ours am: f525666528 -s ours am: 0edb97b507 -s ours

am skip reason: Change-Id I941272023ad401c3b4d5e4bfa17a0e6080331cf7 with SHA-1 bc0652dfdb is in history

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

Change-Id: I5608116944d301164d18f79f87f9968d2bca7b48