[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: 55a8df2f -s ours am: cb63d10c -s ours am: 7267485c -s ours

am skip reason: subject contains skip directive

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



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