[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: 0ee5e26a -s ours am: fe6bf418 -s ours am: bab918e3 -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/+/17046135

Change-Id: I008a9ff06b9a801378034ccdecc3e052b20267b6