Merge "Fix permission checking in SoundTriggerService" into sc-dev am: 7461a557 am: 736badef am: fd2c28bf

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

Change-Id: I3e1df787be39e925bbc275036f3ad98418634e8c