[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: 9122b72c -s ours am: 2cbd2545 -s ours

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

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



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