Merge changes I69128db9,I13db22f8 am: aa15a8ea5d am: 326a722278

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

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