Merge "Fix : recent Connectivity module with old NetworkStack module" am: b30e957777 am: fa4be51142

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

Change-Id: I950165b15b556935635aa9abf873258077f0ed78