Merge "Add more unit tests for ConnectivityManager S APIs" into sc-dev am: f9d1bbb566 am: a65a21d80c am: 2e0aae9f9f

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14640282

Change-Id: I3d09c58b8fff20136b929fe9f565f01cfc1ee9f5