Merge "Use more inclusive language for #inclusivefixit"

    <!-- Permissions must be defined here, and not in the base manifest, as the network stack

         running in the system server process does not need any permission, and having privileged

         permissions added would cause crashes on startup unless they are also added to the

         privileged permissions whitelist for that package. -->

         privileged permissions allowlist for that package. -->

    <uses-permission android:name="android.permission.INTERNET" />

    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />

    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />

            mPacket = ByteBuffer.wrap(Arrays.copyOf(packet, length));

            mLastSeen = currentTimeSeconds();

            // Sanity check packet in case a packet arrives before we attach RA filter

            // Check packet in case a packet arrives before we attach RA filter

            // to our packet socket. b/29586253

            if (getUint16(mPacket, ETH_ETHERTYPE_OFFSET) != ETH_P_IPV6 ||

                    getUint8(mPacket, IPV6_NEXT_HEADER_OFFSET) != IPPROTO_ICMPV6 ||

        assertNotNull(params.macAddr);

        assertTrue(params.hasMacAddress);

        // Sanity check.

        //  Check interface "lo".

        params = InterfaceParams.getByName("lo");

        assertNotNull(params);

        assertEquals("lo", params.name);