Merge "Allow privapp ImsServiceEntitlement read/modify phone state" into sc-dev