Merge changes I29f7d2b4,Ie2aa7529 am: d837becc15

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

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