Merge "[DO NOT MERGE] Revert "Fix system zen rules by using owner package name if caller is system"" into qt-dev am: 020e76f630

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

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