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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie8cdd5f7eec86f8bc882f70dbc7480a0c0669358
tree: e4cbe027ad96bbfa8bc369ef64a722bec20c9e55
  1. framework/
  2. service/
  3. OWNERS