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

[automerger skipped] RESTRICT AUTOMERGE Disable the Trusted Hotword requirement am: c5e8f7f5 -s ours am: 450dc26b -s ours am: 0a90d914 -s ours

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

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



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