[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: ebbcea27 -s ours am: 6e22fdc7 -s ours am: fd2cc53b -s ours am: 4d22dcee -s ours

am skip reason: subject contains skip directive

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



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