Merge changes I943d4efb,I02378125,I2ee4ae52 am: 3a093baccb am: b2c2553304 am: 4f134ef21c am: efd7a3e313

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

Change-Id: I748ede390a7ce16c73a4942e6c50a315866268a0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>