[automerger skipped] RESTRICT AUTOMERGE Disable the Trusted Hotword requirement am: c5e8f7f59d -s ours am: 7153eb1006 -s ours
am skip reason: Merged-In I68f2f37b5ce835e7fd8649b382eaee9fc299ec79 with SHA-1 0e7131f309 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18694052
Change-Id: Id70e6dfdda086261ed85bbcce41498b9eb1b92c9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: