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

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

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