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

Change-Id: I96199626fa923fc4400f45c0aad95e05824d616f