[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-qpr-dev am: 543b4013 -s ours am: f56d70b8 -s ours

am skip reason: subject contains skip directive

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



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