[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 tm-dev am: cfc0cfa5 am: fdf87752 am: 3ed49e5e -s ours am: 1b52b06e -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/+/19868476



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