[automerger skipped] Merge "[DO NOT MERGE] Revert "Fix system zen rules by using owner package name if caller is system"" into rvc-dev am: da89ac7e3c -s ours am: 88e833e696 -s ours am: db3a12a93c -s ours am: db778b8ca1 -s ours am: 9c8a89396c -s ours am: 10c7240805 -s ours am: 832ffe184f -s ours

am skip reason: subject contains skip directive

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

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