Merge changes from topic "carrier_id_aosp_cp"
am: c38d7c37dc

Change-Id: I0b3da9f1912983c844327ddb9319d48c0acb6455