Merge history of packages/Connectivity am: 2afd0986d3

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

Change-Id: I7507f15a8a7b178035eda8af2345f19baa7267ec