Merge changes I81bf8969,I2edba513,Ibb913979 into sc-dev am: 98c351f429

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

Change-Id: I92bceef971050f9afc1fea0e1f3a3e6f4391db5f