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

[automerger skipped] Merge "RESTRICT AUTOMERGE Disable the Trusted Hotword requirement" into sc-dev am: c0f7c384 am: 45b16df6 -s ours am: 9b37146f -s ours am: 39f0869b -s ours

am skip reason: subject contains skip directive

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

Change-Id: I7a4894213db9263021e820fe7136dc7482bb9cba