[automerger skipped] Fix system zen rules by using owner package name if caller is system am: 0b262d0ae5 -s ours am: cb57bce342 -s ours

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

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

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