Merge changes I54d367fd,Ib789dc59 am: aa257b1449 am: f627a2e62b

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

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