[automerger skipped] Merge "Device show "No SIM card" and then showing carrier name during boot" into pi-dev am: 2f97046a4e
am: e4df226c6d  -s ours

Change-Id: I7464a4d5118ecb73a822140e23d4843b6a16d614