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

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

Change-Id: Iced4d9ea7ad5b02216d5ef57715665918b4023e1