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

[automerger skipped] Merge "RESTRICT AUTOMERGE Disable the Trusted Hotword requirement" into tm-dev am: 7cefdd37 -s ours am: 05f510bd -s ours am: 43f53011 -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: Ia6cb68d6a7c2fce63d01b4caa66e9e060d6cf39f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>