[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 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: Iac92362c4a30230920b9803085d67aa9b39a300b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>