[automerger skipped] Merge "NetlinkEvent - ignore captive portal and pref64 nd user opts" into rvc-dev am: f7e5fb6f -s ours
am skip reason: Change-Id I811c75e9a4739db149f502b9a43c99a8ed883341 with SHA-1 a806a715 is in history
Change-Id: I2ab04b34b593a94e355c93a4f503cca19fb3f50b