Merge changes Icd871654,I7c70328d am: 1efc2bc73f

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

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