Merge "Allow companion device mgrs channel access" into oc-dev am: de99065a40
am: a38256bb7b

Change-Id: Ieef842a262e0f10f01ef801d4b8e4f3c80b83ef6