Merge "Remove hidden @NetworkType in NetworkInfo" am: f829e86db8 am: 2e28bfa25b am: a9a58051fd

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4868ba91efd24c4544dc6ce044e1b76d50c1a611
tree: 75f78a6ea71d20b525f63b51c46c3d1d3b0ad1b4
  1. core/
  2. framework/
  3. service/
  4. services/
  5. tests/
  6. OWNERS