[automerger skipped] Fix system zen rules by using owner package name if...

[automerger skipped] Fix system zen rules by using owner package name if caller is system am: d9ead5f4 -s ours am: f9c7dca6 -s ours am: 022793b3 -s ours am: bc602a2c -s ours

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

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



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