[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: a8bdabf9 -s ours am: 84766f47 -s ours am: 4dd93e9e -s ours

am skip reason: subject contains skip directive

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



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