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

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

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