Merge "Move companion device check to the handler" into oc-dev
am: 077b1ea14d

Change-Id: Ibb3dcd97136da1d5d131457c2a2596ccc09c1485