Merge "[DU12]Remove NetworkType Annotation" am: 7da58cca81 am: afbb5462ff am: 2bbc4b4335 am: a2ced2252c

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

Change-Id: I25de40b8818edfdfc1b55b4b6fcb9ecf0de37d00