Fixing Carrier detection and selection for stock libril.so from SE.

Change-Id: Iec89c368efebb57ab20437ecf620f1cdbe96b036