[automerger skipped] Merge "Add an OEM configurable limit for zen rules" into...

[automerger skipped] Merge "Add an OEM configurable limit for zen rules" into sc-v2-dev am: 651401d2 am: bf6f0aa0 -s ours

am skip reason: Merged-In I3da105951af90007bf48dc6cf00aed3e28778b36 with SHA-1 413f7442 is already in history

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

Change-Id: I9fa37a4525d33d3c439e8f6e76ac88ea41c1ee3c