Merge "Update comments for ACTION_CARRIER_CONFIG_CHANGED." am: 7b9a785d65
am: e2075c2c7d

Change-Id: Ib3e807a900fcc548e88f10b4622e8203fe6d72be