Merge "[SUBID01-1]Grow NetworkIdentity to include a new mSubId field" am: 8039c85336

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1895196

Change-Id: I708e1b7db095cbe7c505ea81af64e712bebc6a33