Merge changes I943d4efb,I02378125,I2ee4ae52 am: 3a093baccb

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

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