[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-v2-dev am: 947d3130 -s ours am: 69cb65e1 -s ours am: 279aaa8b -s ours

am skip reason: subject contains skip directive

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



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