Merge "Restore empty ZenRule#conditionId after a device restart" into tm-qpr-dev am: 710d3976a0

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

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