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