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

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

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