Merge "Remove service-permission apis from non-updatable"