Merge "SoundTrigger owner cleanup" am: d8abef0d9f am: 127bd7bdf8

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2399135

Change-Id: I340d81ad89ea1c1b86e6b67ea7a187360c7bae7e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>