[automerger skipped] Fix NPE when deleting old zen rules am: 7bb9cd92 am:...

[automerger skipped] Fix NPE when deleting old zen rules am: 7bb9cd92 am: 8a021141 am: b953b5ef -s ours am: 1cb919e3 -s ours am: 5f6329c8 -s ours am: 98794fcb -s ours am: 80ad9893 -s ours am: 8b95295a -s ours am: 5421446b -s ours am: 9e719af0 -s ours

am skip reason: Merged-In I069fcc124af24227fa50b61d4fc55d6dadc7a20b with SHA-1 93aa03a0 is already in history

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



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