[automerger skipped] Merge "RESTRICT AUTOMERGE Disable the Trusted Hotword requirement" into sc-dev am: c0f7c384df am: 45b16df600 -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15606284 Change-Id: I3ad85e7bb05b3ef7a72b83e14253117e74ce9cd9
This commit is contained in: