Merge "[SUBID01-0]Grow NetworkIdentity to include a new mSubId field" am: 9a74429f56

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

Change-Id: I8000c63c159d50d032853abb91723eab20da1e0a
tree: 929da48dd762718e737a24f537093ecde43c5823
  1. framework/
  2. framework-t/
  3. service-t/
  4. services/
  5. tests/