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

Change-Id: I49be989c2946e10e8b8de7097bffd999045dbf62