[automerger skipped] Merge "RESTRICT AUTOMERGE Disable the Trusted Hotword...

[automerger skipped] Merge "RESTRICT AUTOMERGE Disable the Trusted Hotword requirement" into tm-d1-dev am: 0b5a16a2 -s ours am: 04ea1b98 -s ours

am skip reason: Merged-In I68f2f37b5ce835e7fd8649b382eaee9fc299ec79 with SHA-1 c5e8f7f5 is already in history

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



Change-Id: I6b962679b1b805313b4b92d16b682206b20bbe3a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>