[automerger skipped] Merge "Remove the usage of hidden APIs from NetworkInfo"...
[automerger skipped] Merge "Remove the usage of hidden APIs from NetworkInfo" am: 4e495ae0 am: cc4d9d82 -s ours
am skip reason: Change-Id I635fc707b614eddef320cdc84c83a05840f95977 with SHA-1 b60e9882 is in history
Change-Id: I2781d6286ef66010821ed90aca161d7e87826db0