[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 sc-dev am: 74f4246a -s ours am: de3c7fc6 -s ours am: bce4bc72 -s ours am: 43ac9617 -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/+/19868479



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