[automerger skipped] Merge "[DO NOT MERGE] Revert "Fix system zen rules by...

[automerger skipped] Merge "[DO NOT MERGE] Revert "Fix system zen rules by using owner package name if caller is system"" into qt-dev am: 020e76f6 am: 4278c4ff -s ours am: 71bfa22c -s ours am: ea7cb4db -s ours am: 92ac6fa9 -s ours

am skip reason: subject contains skip directive

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



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