Merge "Mark NetworkAgentConfig fit for inclusion in stable AIDL"