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

Change-Id: I3a0cbabe8c86a600c0b9671ceedcbbc7cfa06595