[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: 9b1a9dc7 -s ours am: 2f0fb97c -s ours

am skip reason: subject contains skip directive

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

Change-Id: I4fb92a6e8c6334a94b15daf52d9e162ce5e7b02b