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

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

Change-Id: I650232c6ab547af205a3717ff3107c925956f8e6