[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-qpr-dev am: 72d9b9c9 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I58805e9c5f18f5843d63becba6a26c22fe3d81c6