Merge changes Ic6ff7a3d,Iff9b9792 am: 5d787feef0 am: 78df805366

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

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