Merge "Make Trusted Hotword session permissions follow previous behavior" into sc-dev am: e81ea6bebd am: fe6bae4da0 am: bd0c9bd313

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

Change-Id: Ic7563b222bb1f4584620bafcd3a48ffe14cd2a7c