Merge "Remove hidden @NetworkType in NetworkInfo" am: a247ffeaad am: 09702cc405 am: b618bb7728

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4868ba91efd24c4544dc6ce044e1b76d50c1a611