Merge changes Id92a2338,I38671aa2,Ic2df53f1 am: bebd8b0b54

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

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