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

[automerger skipped] Merge "Enforce zen rule limit on a package level." into tm-dev am: ae2d0be6 -s ours am: a7f76ded -s ours

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

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



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