Merge changes Id5f5bdfc,I67b9f30b am: 984c39992c am: c5f5bc136b

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

Change-Id: I1688412e0796c261a18fdb3273a0f185fc93d870