Merge changes I77dc5556,If772078c,Idb19b0f7 into sc-dev am: e7ac3ffec5

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

Change-Id: I3bb589deffd64544931966e94502a658f3945d10