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

Change-Id: I909e4238fe74940a6a1e3a4e9a1a8f7f3dc45dd6