Merge changes I69a2970d,Ibfb3ae48,Ie595cf1f am: 9ab777b5d5

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

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