Merge changes Id92a2338,I38671aa2,Ic2df53f1 am: bebd8b0b54 am: 5f6acad75f

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

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