Merge "SoundTrigger owner cleanup" am: d8abef0d9f

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

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