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

[automerger skipped] Merge "Fix system zen rules by using owner package name if caller is system" into rvc-dev am: 06377249 -s ours am: b6ae840c -s ours

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

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



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