[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-v2-dev am: 740cef8b am: 61c00e66 am: 86b4dd93 -s ours am: 51d7b8c5 -s ours

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

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



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