[automerger skipped] Merge "[DO NOT MERGE] Revert "Fix system zen rules by using owner package name if caller is system"" into sc-dev am: 1585f7c77d -s ours

am skip reason: Merged-In Id69b671592396ac3304862dadbe73de328a8e27a with SHA-1 5c344d8a1f is already in history. Merged-In was found from reverted change.

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

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

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