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

[automerger skipped] Merge "RESTRICT AUTOMERGE Disable the Trusted Hotword requirement" into tm-qpr-dev am: 721da615 -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/+/18921554



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