Merge changes I29f7d2b4,Ie2aa7529 am: d837becc15 am: b6145a26d5

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

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