[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 qt-dev am: 81f051ef am: 14dec12d -s ours am: 112d4908 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I8a73d4a62be17c4ed08f3e9ae2138f8ea4d332ee