Merge changes I833bff2a,I87c60690 am: 37f9b2888c am: 6a46db6b6c am: bab6681c65

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

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