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: Ifd74ecea09dda5ff534e05ca4bb293bbf32b788e