Merge "Remove bundled CompanionDeviceSupport permissions"