[automerger skipped] Merge "Fixed that carrier config changed event not sent" am: 41bc1f4c24
am: e9089d44da -s ours
am skip reason: change_id Ibab66a8b7827846806eaef02d7e12d384b1ef2da with SHA1 f166132180 is in history

Change-Id: I2a2c9ebbffb1741442d68452b52af07deb177220