[automerger skipped] Merge "enforce limits for...

[automerger skipped] Merge "enforce limits for VisualVoicemailSmsFilterSettings properties" into udc-dev am: bd80cd1f am: c5e28cff -s ours

am skip reason: Merged-In Id4b4358b141bb211a7e340b979774850b4bd2403 with SHA-1 0f8b5535 is already in history

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



Change-Id: I69620118a1445a5fff8ea9ef260a82debcd9708a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>