Merge changes If25054c3,I2f58d769 am: 1d0b66942e

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

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