Merge "[TestOnly] Replace isRouterAdvertisement with isIcmpv6Type"