Merge "Add null check for mIntent in ZenRulePreference to avoid potential crash risk" am: 36a80cd8e6

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2200576

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