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