Merge "[SUBID01-0]Grow NetworkIdentity to include a new mSubId field" am: 8e7b0f1a00 am: 6321029723

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

Change-Id: I441a5bb32bcc491a9c6f8ec06823d4273c36fd72