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

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

Change-Id: Iaaf59237f23913918b12ad987a35c3110ed86ea0