Merge changes from topic "carrier_id_aosp_cp"
am: fccdf46adf

Change-Id: I7a332c2ec55081ba7e64cd776203f86f4916a22f