Merge "MNCs not in carrier_list can get the wrong MNC value" am: 5386251835

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

Change-Id: I0d3f3893012edea6a2572040fcab488c7338499c