Merge changes I4994dd8d,I98c1aab4 am: 472d51344c am: fccaf1b299 am: bbfeebace0

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

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