tree 9703396ddb442a61bb45a793d1cdc4f8e70137ad
parent ad1c6840bfcda0c72da16cf535b4e5204e10645c
parent 632102972364e2bba65589821f52dc906d797332
author Frank Li <lifr@google.com> 1646227696 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1646227696 +0000

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