Merge changes I19c2370e,I85f17cfd,I88e73cbd,Ife95ecdf,I83903596, ... am: 9e99270eee am: 01c0b410ba

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

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