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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Icb0760fa7c4c83eaf9ac4fff9e7b46bd9cc3ecfe