[automerger skipped] Merge "Enforce zen rule limit on a package level." into...

[automerger skipped] Merge "Enforce zen rule limit on a package level." into sc-dev am: bbc3447e -s ours am: e04ee4c6 -s ours am: b9844bfa -s ours

am skip reason: Merged-In I35daf9a24f546ae25a78a2d841be39072cdc5641 with SHA-1 ed090a26 is already in history

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



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