Merge "Make Trusted Hotword session permissions follow previous behavior" into sc-dev am: e81ea6be am: 6c1b160a am: a95c9695

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

Change-Id: I96534e265a88b2fe83565b6a456b673961f34391