[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 tm-dev am: b1ace5c4 -s ours am: 5a289d4b -s ours am: d4b206af -s ours am: 18793fa9 -s ours

am skip reason: subject contains skip directive

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



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