[automerger skipped] Merge RQ2A.210305.007 am: e21d3d9247 -s ours am: 358976caaa -s ours

am skip reason: Change-Id I0bcb339f01c664e59e258daf901460523b84c468 with SHA-1 d38016f885 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iab677f45318387e2acf78125f1ad00c7e2a20a8c