Merge "Add more unit tests for ConnectivityManager S APIs" into sc-dev am: 7a5dda8b am: 9b01d812

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

Change-Id: I3a6c01a5879910bb7e323d146d097f94e6d521a6