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

Change-Id: I7de72421e62670f69d2d85837868efe0ef019a0a