[automerger skipped] Fix system zen rules by using owner package name if caller is system am: 0b262d0a -s ours am: cb57bce3 -s ours am: d38cce80 -s ours am: 210b6dec -s ours am: 6702470a -s ours am: af13ad2f -s ours am: bee4d2ac -s ours am: 3e44b86b -s ours am: 7f3e7832 -s ours am: 761260f0 -s ours

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

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



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