Merge changes I50f224f6,I66c34ac0,I63f5fb23,I70b57072,I1d73f843, ... am: 3d153d4f89

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

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