Merge changes I7414c278,I11c7ea70 am: 778c9c9f52 am: a53d3cf318 am: da9af0d021 am: 7e34a0c2c7 am: 1f964d2732

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

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