[automerger skipped] Merge changes from topic "carrier_id_aosp_cp" am: fccdf46adf am: 8463ad7760
am: db45db791a  -s ours

Change-Id: I044825b3a1b72e86e1cb1e4336b9e19eafd7b333