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

Change-Id: I9386692da93413a6b9fec51045d003fba5284401