Merge "Make associate companion apps permission @SystemApi" into sc-dev