[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-dev am: 13de1bee -s ours am: 2fc134a7 -s ours am: 3f0d2e8c -s ours am: 8b8b360a -s ours am: 3d710fc7 -s ours am: 0d523818 -s ours

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

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

Change-Id: Ie80604db8985d1b932d4c63d7660a2de8fdc9dad