Merge changes Icd871654,I7c70328d am: 1efc2bc73f am: 0908c8a645 am: 95bdfa6cb2

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

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