Merge "[Companion] Dont crash if started with bluetooth off" into oc-dev
am: c55f7d2180

Change-Id: I024af9dfe70fb340b2dc481f8aad6b12351b56cb