[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: db3a12a9 -s ours am: db778b8c -s ours am: 9c8a8939 -s ours

am skip reason: subject contains skip directive

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



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