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

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

Change-Id: I6de5316b82cde19a922fdd9ea636e5eb7eae2bc1