[automerger skipped] Merge "Fix system zen rules by using owner package name if caller is system" into rvc-dev am: 06377249c0 -s ours am: b6ae840c5d -s ours am: 697d4897cf -s ours am: c8db189722 -s ours am: dd16618bbc -s ours am: b322597c8d -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: I975571fbadf47981c6fa7d7398e9ff980fa80c43
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>