Merge "Split out NetworkPriorityClassifier and UnderlyingNetworkRecord" am: 42bf9da702

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

Change-Id: I76c541ac5ec113118bb94e02e6fe14a441c0d2b1