Merge "Merge history of packages/Connectivity" am: e107f26c5d am: d9338f3219

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

Change-Id: I71723d3459c14644140b81901dac972b2a746094