[automerger skipped] Merge "Add an OEM configurable limit for zen rules" into sc-mainline-prod am: 682fdd6970 -s ours
am skip reason: Merged-In I3da105951af90007bf48dc6cf00aed3e28778b36 with SHA-1 7409354d3a is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17046263
Change-Id: Ib12607bdaf8fd978e65c1edaa1faff5634acd461
This commit is contained in: