Merge "[MS64] Remove subscriberId and NetworkId in proto" am: 0433d02aa5

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

Change-Id: I6d18cbe5f6b03c446354ed12bd73566a638906e5