Merge changes I727849fa,If31ccbc7 am: 22a0120260 am: 05199abdb0

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

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