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

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

Change-Id: Id1a89bb51bcf62a6949acfe91b7ee1bfb6b5972e