Merge changes I7414c278,I11c7ea70 am: 778c9c9f52 am: a53d3cf318 am: da9af0d021

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

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