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

Change-Id: Ibd4cb8cf7e26d3b0d54837c50843818bc532a446