[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: 947d313053 -s ours am: 69cb65e1ac -s ours am: 4e5c5fbc5f -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20404656 Change-Id: Ie0b1b82fbf8a619d7660da3ecf3c395f628605d1 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: