[automerger skipped] Merge "Add an OEM configurable limit for zen rules" into sc-dev am: 13de1bee05 -s ours am: 2fc134a763 -s ours am: 3f0d2e8c2b -s ours am: 8b8b360a36 -s ours am: 3d710fc7f6 -s ours
am skip reason: Merged-In I3da105951af90007bf48dc6cf00aed3e28778b36 with SHA-1 0531027915 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17046135
Change-Id: Ib049e6d86e87f3814fa2d85b6030cf2735b86937
This commit is contained in: