[automerger skipped] Merge "Update import class of TAG_SYSTEM_NEIGHBOR" am: 5316e1ff18 am: 9c3cfaa9b8 am: b3cc853814 -s ours
am skip reason: skip tag Change-Id I8fcd2772ed873d318233d3029184e4352245d4cd with SHA-1 8369a74fab is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1626079
Change-Id: I9cea9b056fa9c833245e7dc851319ce78909ff8d
This commit is contained in: