[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 qt-dev am: 3fe8fdc4 am: 85d0cb31 -s ours am: 4bc4a7d7 -s ours

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

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



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