[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 am: 477b38dd -s ours am: 25ea563c -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: I223a40437042d9cb42ea8b6308b420b086a037d1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>