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

am skip reason: subject contains skip directive

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



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