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

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

Change-Id: Iec7f4c328afd1d61ddcd787ffe05187ee9d954da