[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 sc-dev am: 1585f7c7 -s ours am: f80526cb -s ours am: 11aed953 -s ours am: a5283fc0 -s ours am: 63e80f94 -s ours

am skip reason: subject contains skip directive

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



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