[automerger skipped] DO NOT MERGE Add an OEM configurable limit for zen rules am: 3072d98c2d am: db048de08d -s ours am: 31ea70be4d -s ours am: 8ed03bc2bb -s ours am: 098f855189 -s ours am: 27063f7752 -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17045726 Change-Id: Ia9c5782e1850fc131d11301c39482bdd21169b59
This commit is contained in: