Merge "Remove hidden @NetworkType in NetworkInfo" am: e01042965a am: 19feee80d0 am: b618bb7728

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4868ba91efd24c4544dc6ce044e1b76d50c1a611
tree: 1920598d29cf8399bc0932d7c945b5974ce74ef3
  1. framework/
  2. service/
  3. OWNERS