Merge changes I943d4efb,I02378125,I2ee4ae52 am: 3a093baccb am: b2c2553304

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

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