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

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

Change-Id: Iab0ec0b6b722aeee38bcfb3328e17a040c117f50