Merge "add null pointer check before installing ota carrier id"
am: 121360885b

Change-Id: Ia90f821034ce17f5a5f03c6b7303f273726dfb65