Merge changes I41743f47,I22577615,I46f806a8,Icaa1df2e am: 0b39135e3e

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

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