Merge changes Ide01c994,Ia9f12a7b am: 708b1ab707 am: f2678a4464

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

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