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