[automerger skipped] [DO NOT MERGE] Revert "Fix system zen rules by using owner package name if caller is system" am: 8de098ee2f -s ours am: 5293d5277d -s ours am: ca1ac4748b -s ours am: f67c2d8c0f -s ours am: 8a4fb2556f -s ours am: 18c425aad1 -s ours

am skip reason: subject contains skip directive

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

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