Merge changes I270ff43c,Ifc7eee24 am: cec294d1b4

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

Change-Id: I435e69ba3fc71cf56a7bf8cc54b394831615fa57