Merge "Revert "Fix system zen rules by using owner package name if caller is...

Merge "Revert "Fix system zen rules by using owner package name if caller is system"" into tm-qpr-dev am: dcb12923

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



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