[automerger skipped] Merge "[SUBID01-0]Grow NetworkIdentity to include a new mSubId field" am: 9a74429f56 am: 02ac2482a1 am: 8ebf129e09 -s ours

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

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

Change-Id: I192c1e015b65fbf1b8c6c1b7ed0fe7380600663d