Merge "Adding fields in Telephony.java to support the CarrierProvider. Needed for ImsiEncryption."