[automerger skipped] Merge "[SUBID01-1]Grow NetworkIdentity to include a new mSubId field" am: 8039c85336 am: 77e18cd8ad am: 5a90248383 -s ours

am skip reason: Merged-In I8549b11d0fcfc5a9426724d6b90de27b707cb77c with SHA-1 1f788606a0 is already in history

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

Change-Id: I7713eff398d0a27028be553e74fd3d7e2d67a3da