[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-mainline-prod am: 682fdd69 -s ours am: 76d1e3f0 -s ours am: 7574087d -s ours

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

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

Change-Id: Ia874e023a04eaf0846e4718c2bbf48f23af842a3