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

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

Change-Id: Id621698f6ff5e39314a7f2f5fc3d47aa96506bce