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