Merge changes Icd842479,I2206a846 am: d78cda2ba8

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

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