[automerger skipped] Merge changes from topic "carrier_id_aosp_cp" am: c38d7c37dc am: 56d7e82df9
am: de06731cfb  -s ours

Change-Id: I283b77f6945b8ab1fd4b35a23231fe9d0fe8fe5b