Merge changes Ie5689ba6,I6056da19,I89f39129,I6760d579 am: 8ed131dd0b

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

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