tree e4f796af2471b45db3b3b1a58cb093c6bba05159
parent 3145aa352d0ea369031d9be6795674f72fc63930
parent 904d7921b9632f7d091e7bd63ef7e76dd122fd24
author Xin Li <delphij@google.com> 1598996786 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1598996786 +0000

[automerger skipped] Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709) am: bc0652dfdb -s ours am: 904d7921b9 -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: I832f1177c47c17655e40ec384d134547cf9a1112