Merge changes Ib068ffc9,I4154659c am: 4864c7fb0e

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

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