Merge "SIM card with EF_SPN and display condition b2=0 b1=0registered home...
Merge "SIM card with EF_SPN and display condition b2=0 b1=0registered home network, the carrier name display was wrong" am: 8f192f22 am: 0b8ae52f
am: fd7c9314
Change-Id: I09bf6034f28c944474732e7f80e5052e26e28977