[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: f12f2d46 -s ours am: 2c57dbe9 -s ours am: 23faeff8 -s ours am: 3208b7be -s ours am: 042e5182 -s ours

am skip reason: subject contains skip directive

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



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