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

Change-Id: Iad09afd86c9e6b3692654083743d5014b978cac8