Merge changes I5d3e448e,Id69ac1d3 am: 02eea987c0 am: b675eba4c1

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

Change-Id: Iede15400f50e5e0f37a95f59b924d8b7dd698509