Merge changes I00d1aa47,Icffbe67f into sc-dev am: c056232f0e

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

Change-Id: I60f42848b46edcef0d29fa355c663ab08a586c4b