Merge changes Icd871654,I7c70328d am: 1efc2bc73f

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

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