Merge changes I270ff43c,Ifc7eee24 into sc-dev am: 6cea6edc9c

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

Change-Id: I980645261d72ea068739c235988417c277fb8bf5