Merge "Cleanup for Android's inclusive language guidance in INetd.aidl"