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