[automerger skipped] Merge "Restore empty ZenRule#conditionId after a device restart" into tm-qpr-dev am: 710d3976 am: 6315fcdb -s ours am: 608cb461 -s ours

am skip reason: Merged-In I2e00c79216734f6c2db7d5b1347ab72a9be5cdc3 with SHA-1 1cc88e77 is already in history

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



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