[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: 9631f58f -s ours am: ea4f802c -s ours am: 6f7ee54f -s ours am: ad310bb8 -s ours am: aed9e216 -s ours

am skip reason: subject contains skip directive

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



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