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