[automerger skipped] Fix system zen rules by using owner package name if caller is system am: 5c344d8a1f -s ours am: e458cc5603 -s ours am: e1cb919b2b -s ours am: 6d3157e1ab -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: I804987de1ccf74725c16e3ffe2b7d5645d23c61c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>