Merge changes I944f4c6a,I69cf58bc into sc-dev am: cd60e94a2c

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

Change-Id: I580752faf2023115140dfecd1b6de09392203a4d