Merge "[DU12]Remove NetworkType Annotation" am: 7da58cca81 am: 5a4f6f806f

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

Change-Id: I859f984cb4ef0f0a1291d931f07fc58b530a3408
tree: 19724ecb8d4655879fec6020af10376faadc5dd0
  1. framework/
  2. framework-t/
  3. service-t/
  4. services/
  5. tests/