Merge "Use SystemProperties to access ro.carrier as System.getProperty cannot get it" am: e938109e26
am: 648fab541b

Change-Id: I8b0ac8152a3a557b881ff95061289033366d8c6b