[automerger skipped] Merge "DO NOT MERGE Add an OEM configurable limit for zen...

[automerger skipped] Merge "DO NOT MERGE Add an OEM configurable limit for zen rules" into rvc-qpr-dev am: 72d9b9c9 -s ours am: 21726fc8 -s ours am: e9108199 -s ours am: e5276aed -s ours

am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17045626

Change-Id: I96be3213f21e071f4c66396d64e17d4fdeb7302c