Merge changes I33bc80cc,Ie84e2cd4 am: fd402476f1 am: 0d3d27ecc1

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

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