[automerger skipped] [DO NOT MERGE] Revert "Fix system zen rules by using owner package name if caller is system" am: 7deb6e4565 -s ours am: 6fbb8bd7f2 -s ours am: b22722a0f3 -s ours am: c84ac8093c -s ours am: 113483da7d -s ours

am skip reason: subject contains skip directive

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

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