Merge "Move NetworkState to Connectivity" am: d0355e1be2 am: e878fb157a

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3f87db84ac7d49c7f781ff9bd188f90dac54db8e