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

[automerger skipped] Merge "RESTRICT AUTOMERGE Disable the Trusted Hotword requirement" into tm-dev-plus-aosp am: 053549fe -s ours

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

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



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