Merge "[MS64] Remove subscriberId and NetworkId in proto" am: 57c4d95609 am: e6a6334c3c am: 4fc736f508

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

Change-Id: Iab0ec0b6b722aeee38bcfb3328e17a040c117f50
tree: cc12e207976c286fa7672e4f8676344f2096bc25
  1. core/
  2. framework/
  3. framework-t/
  4. service-t/
  5. services/
  6. tests/