[automerger skipped] DO NOT MERGE Add an OEM configurable limit for zen rules am: 1db5d40205 -s ours am: 97801c8872 -s ours am: 65ed884b58 -s ours am: ed9f9457fc -s ours am: 2b0faceee8 -s ours am: f99cc488e0 -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17046136 Change-Id: I3b63380036a0db295fca11b388e630c5856cd07d
This commit is contained in: