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

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

Change-Id: Ib813755b3be49722e3ef36eff4ace64b067d1eea