Merge changes Ida29dcbb,Icc1f255a am: c9b6d8766b

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

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