Merge changes Icf3df3aa,I92adad60 am: 403d7d7589

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

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