Merge "Move NetworkState to Connectivity" am: 1ef0e93f16 am: d92bb185eb am: 161b1278f7

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Icea1247fd498e8661cb8cba68d34a443004a246d
tree: c384903a6592412cefa03ca5451492e43fc8d351
  1. framework/
  2. service/
  3. OWNERS