Merge "Restore empty ZenRule#conditionId after a device restart" into udc-dev am: 9dc072f3

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



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