Merge "MmsSmsProvider initialize incorrect min_match value" am: 4f1685621b am: 34ac1aa54f am: d7e6ed0178

Original change: https://android-review.googlesource.com/c/platform/packages/providers/TelephonyProvider/+/1553798

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I592f13e596f2de0a971251cfd353935b93b19f27