[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-qpr1-dev am: b8a0062b -s ours am: 02fa4fbc -s ours am: 2a225eff -s ours am: b5d5d086 -s ours

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

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



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