Merge "support carrierid provider update from OTA" am: 359586b1c8 am: d36ad5b8d2
am: b54bdd3e6a

Change-Id: I692737cc4321fb82fa0c0cdc5ce1d2f5c2046693