Merge changes I298816ac,I3f41b4fe,Ibd782029 am: f71485f351

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

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