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

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

Change-Id: I25de40b8818edfdfc1b55b4b6fcb9ecf0de37d00
tree: 5edf7c26b7ee02bff2942e8513df610f017e47d6
  1. framework/
  2. framework-t/
  3. service-t/
  4. services/
  5. tests/