[automerger skipped] Merge "Fix system zen rules by using owner package name if caller is system" into tm-dev am: cfc0cfa510 am: 4cfca24021 -s ours am: a17873b0e1 -s ours
am skip reason: Merged-In Id69b671592396ac3304862dadbe73de328a8e27a with SHA-1 e5e51116fb is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19868476
Change-Id: I50b5119459dbc7abf770be3561413452f9f165c5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: