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

[automerger skipped] Merge "enforce limits for VisualVoicemailSmsFilterSettings properties" into sc-dev am: e6a2cfe5 am: 8a8d5d4c am: 208fb853 am: 352b6e2f am: f202c5a7 am: 8dc6ee3e -s ours am: 56b1d2d8 -s ours

am skip reason: Merged-In Id4b4358b141bb211a7e340b979774850b4bd2403 with SHA-1 27e4e6ae is already in history

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



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