Merge "Fix companion uses-permission enforcement" into oc-dev
am: 7a4cf16ce9

Change-Id: I09daacb8e9d0e4926f83707cce20a9a13e31e4e1