Merge "Update language to comply with Android's inclusive language guidance"

core/java/android/net/ConnectivityManager.java

core/java/android/net/NetworkState.java

core/java/android/net/SntpClient.java

core/java/android/net/VpnService.java

...core/java/com/android/server/net/NetworkStatsFactory.java

...ore/java/com/android/server/net/NetworkStatsRecorder.java

.../net/java/com/android/server/ConnectivityServiceTest.java