[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: 6c7729f469 -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17046136 Change-Id: Ie0d974b8ce6ba408c5fd72f5167da16c206f1045
This commit is contained in: