Merge "Remove bundled CompanionDeviceSupport permissions" into rvc-qpr-dev