Merge "[automerger skipped] Merge "Remove bundled CompanionDeviceSupport permissions" into rvc-qpr-dev am: 2aa95e8d am: c3559532 -s ours"