Merge changes I69a2970d,Ibfb3ae48,Ie595cf1f am: 9ab777b5d5

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

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