[automerger skipped] Merge "Trusted Hotword: Allow disabling periodic restarts." into sc-v2-dev am: c1840b3fd5 -s ours am: e7b4cbc1a1 -s ours
am skip reason: Merged-In I3b17b47fab4120b42d75443b213be3c1ef5491aa with SHA-1 fc651fe0d2 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17344015
Change-Id: I37eb065e8677dc96a4302467e344953aceb8f111
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: