Merge changes If13254d4,I2424bd4f am: df9fbd37c6

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

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