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

Change-Id: I043120179140d3a148926d53b142f186af2bf5ca