[automerger skipped] Merge "Fix system zen rules by using owner package name...

[automerger skipped] Merge "Fix system zen rules by using owner package name if caller is system" into rvc-qpr-dev am: e3434b55 -s ours am: dcbabe5a -s ours am: 99716a27 -s ours am: fc3d6c84 -s ours am: 497f6535 -s ours

am skip reason: Merged-In Id69b671592396ac3304862dadbe73de328a8e27a with SHA-1 78245566 is already in history

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



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