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

Change-Id: I944c5d24f51c26aac54a0c5774531bbbc2d23ca5