[automerger skipped] Merge "Trusted Hotword: Allow disabling periodic...

[automerger skipped] Merge "Trusted Hotword: Allow disabling periodic restarts." into sc-v2-dev am: c1840b3f -s ours am: e7b4cbc1 -s ours am: 9b75fdcf -s ours

am skip reason: Merged-In I3b17b47fab4120b42d75443b213be3c1ef5491aa with SHA-1 fc651fe0 is already in history

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



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