[automerger skipped] Fix system zen rules by using owner package name if caller is system am: 2ceaaebb -s ours am: e0a4c485 -s ours am: 48cf2b8d -s ours am: e4400804 -s ours am: da5637e1 -s ours am: 0d01383c -s ours am: a4643162 -s ours am: 95135c9f -s ours

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

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



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