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

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

Change-Id: I4e3842ae2fa38b3979171ab0b48a94867040a876