Merge changes I270ff43c,Ifc7eee24 am: cec294d1b4 am: 82b26e0d1f

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

Change-Id: I382f551487f70865761b4dcd0dcdcdb425538f3e