Merge "Merge "[Companion] Dont crash if started with bluetooth off" into oc-dev am: c55f7d2180 am: a96ef94e0d" into oc-dr1-dev-plus-aosp
am: b8aba1973e

Change-Id: I22140705c8048b6e42ac63049cdb8358e484fe04