Merge changes Icd871654,I7c70328d am: 1efc2bc73f am: b69c8bed56

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

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