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

Change-Id: I7f736af6fefcd9f4f337c4a5a899719deb6a1290