[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: fcdd759a -s ours

am skip reason: subject contains skip directive

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

Change-Id: I8fd98d8d68daebf280888a2f86a0e1a46ff0ef89