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

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

Change-Id: I859f984cb4ef0f0a1291d931f07fc58b530a3408