Merge changes I69a2970d,Ibfb3ae48,Ie595cf1f am: 9ab777b5d5 am: 31e985a4c2

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

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