Merge "Remove hidden @NetworkType in NetworkInfo" am: f829e86db8

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie8cdd5f7eec86f8bc882f70dbc7480a0c0669358
tree: 350a9fd26c6eb5687cb52b06008cb94982d000cd
  1. core/
  2. framework/
  3. service/
  4. services/
  5. tests/
  6. OWNERS