Merge changes I727849fa,If31ccbc7 am: 22a0120260

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

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