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

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

Change-Id: Ib84d148f27e154ce02c0df2d0ca33692455d6048