Address review comments in aosp/2677976 This commit address the follow-up review comments in aosp/2677976. Fix: 296150560 Test: atest FrameworksNetTests NetworkStaticLibTests Change-Id: I0ff4cef8585e2ae496447c4d37e072c1de281775