Merge changes Id5e5b911,I8301abad,I7262811a,I658e579b,I7d43ef0e am: 4fcb8ad292

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

Change-Id: I689801db7f5ea93167f62a93ee6c8f4ff89533aa