[automerger skipped] Merge "DO NOT MERGE Add an OEM configurable limit for zen...

[automerger skipped] Merge "DO NOT MERGE Add an OEM configurable limit for zen rules" into rvc-dev am: ece6094d -s ours

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

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

Change-Id: I45260bd65864473a57f98ed313eacc7c126bd492