[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-qpr1-dev am: e86aa600 -s ours am: ab080cd4 -s ours am: 0488430a -s ours am: 56c6092e -s ours am: 4a1f499b -s ours

am skip reason: subject contains skip directive

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



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