Merge changes Ieacf0d47,I28e0758f,Ia92c4190,I0ae2d70e am: d8fc418e31

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

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