[automerger skipped] Merge "[SUBID01-0]Grow NetworkIdentity to include a new...

[automerger skipped] Merge "[SUBID01-0]Grow NetworkIdentity to include a new mSubId field" am: 8e7b0f1a am: 63210297 am: 215de950 -s ours am: f4260555 -s ours

am skip reason: Merged-In Ie1fe81006555dbcca4b62457fa6c319f04b4576d with SHA-1 c496554d is already in history

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

Change-Id: I85a61ca1b7be91533642d090e4c4422b38b0043e