Merge "Fix content capture not being usable from hotword detector." into...

Merge "Fix content capture not being usable from hotword detector." into sc-dev am: 78456de8 am: 04f0c39c am: 8bcbf4b1

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

Change-Id: I8d660e0b4381b0cfd011d5c8e95c611cd6727a26