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

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

Change-Id: I522ee4669cfba3140596120a33c4a807baf25446