[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-qpr1-dev am: 2233167c -s ours am: 08cb28d2 -s ours

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

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

Change-Id: I8e0dc4eab9cc8283ed75b9b21c57a279546c38a2