[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-qpr1-dev am: 750ab25f -s ours am: ba7c84ca -s ours am: 7c598383 -s ours am: 7ffa9d56 -s ours

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

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



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