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

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

Change-Id: If4a8927abea24c2bc9157d13de3f9dd55d711192