Merge "Add @TestApi onBindCompanionDeviceService()"