[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: 2a3082d3 -s ours

am skip reason: subject contains skip directive

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



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