[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: f308e83a -s ours am: 11660ceb -s ours am: 8f153b64 -s ours am: 795ffb43 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I8e9d31bf6a510e2fe3ea6fd89ef77861a0fb44a1