[automerger skipped] [DO NOT MERGE] Revert "Fix system zen rules by using...

[automerger skipped] [DO NOT MERGE] Revert "Fix system zen rules by using owner package name if caller is system" am: 7fcdd1fa am: aa82e1c9 -s ours am: ee98ca9b -s ours am: 85d658cc -s ours am: 146685b3 -s ours am: 9298e999 -s ours am: a156dc42 -s ours am: 041d1aeb -s ours am: 6f619501 -s ours am: 381b1cca -s ours am: 9e59c154 -s ours

am skip reason: subject contains skip directive

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



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