[automerger skipped] Merge "Wait for card presence before starting OTA" into qt-dev
am: cd30241e -s ours
am skip reason: change_id Iad5a7397f7508a930b6aa180da35ce84d6c7b3a5 with SHA1 b99a5561 is in history
Change-Id: I66ea65390b4fb1155fe62591e8cc5b1aeafff376