Merge "Fix lint issues in NetworkAgentTest.kt."