[automerger skipped] Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709) am: bc0652dfdb -s ours am: 904d7921b9 -s ours am: 0da08a9c03 -s ours am: 70242683d7 -s ours

am skip reason: Change-Id Ibe9b0af76fd841db7e64bf8800264df149278cbf with SHA-1 a44b9e17c7 is in history

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

Change-Id: I19826939ccb41b50ef5f3d872e9c2667dfca1c4c