[automerger skipped] DO NOT MERGE Add an OEM configurable limit for zen rules am: b21e9e17f6 -s ours am: ee9f86ef77 -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17045626 Change-Id: Ie86a2b0ab8439d06b93e12620a092fe796aa5f05
This commit is contained in: