Merge changes I69947ef2,Ie62454be,I756e4451,I437fe4cc,I850678bd, ... am: 1a31ed3f3f

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

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