Merge changes I403ffbf7,I62891082,Iac185d3a,I2b78a7b8 am: 260bd7381f

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

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