[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 sc-v2-dev am: 6c988a7b -s ours am: 54e563ac -s ours

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

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



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