Merge "Make CompanionDeviceManager.apk to platform signed" into tm-dev