[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: 7deb6e45 -s ours am: 6fbb8bd7 -s ours am: b22722a0 -s ours am: c84ac809 -s ours am: e0292626 -s ours

am skip reason: subject contains skip directive

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



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