[automerger skipped] [DO NOT MERGE] Revert "Fix system zen rules by using owner package name if caller is system" am: 7fcdd1fa0e am: aa82e1c91c -s ours am: ee98ca9b78 -s ours am: 85d658cc5a -s ours am: 146685b3ef -s ours am: 9298e99970 -s ours am: a156dc4234 -s ours

am skip reason: subject contains skip directive

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

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