Merge "Set NetworkIdentity subscriberId on all networks" am: 1ded24221e am: 1a55bddfc3

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

Change-Id: Ib1009d0ce0e54330c00aee7fa1c45abe43c86777