[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: 8de098ee -s ours am: 5293d527 -s ours am: ca1ac474 -s ours am: f67c2d8c -s ours am: 8a4fb255 -s ours

am skip reason: subject contains skip directive

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



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