[automerger skipped] Merge "Fix system zen rules by using owner package name if caller is system" into sc-qpr1-dev am: b8a0062b74 -s ours am: 02fa4fbc3f -s ours am: 2a225effa6 -s ours am: 9374bca3df -s ours

am skip reason: Merged-In Id69b671592396ac3304862dadbe73de328a8e27a with SHA-1 d9ead5f42c is already in history

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

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