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: f1d2441d am: 96602b2c

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

Change-Id: Iea2cdbccecab9be0450f2966fa25cd20d9cd52dd