Merge "Update import class of TAG_SYSTEM_NEIGHBOR" am: 5316e1ff18

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1626079

Change-Id: Idd6ae755683a38d665a7b0744bcd7d8d1d29ea6f