[automerger skipped] Fix system zen rules by using owner package name if caller is system am: 2ceaaebb3c -s ours am: e0a4c485a3 -s ours am: 01f768455e -s ours am: f91eb44aff -s ours

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

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

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