[automerger skipped] Merge "[DO NOT MERGE] Revert "Fix system zen rules by...

[automerger skipped] Merge "[DO NOT MERGE] Revert "Fix system zen rules by using owner package name if caller is system"" into rvc-dev am: da89ac7e -s ours am: 88e833e6 -s ours

am skip reason: subject contains skip directive

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



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