Merge "Revert "Remove the usage of hidden APIs from NetworkInfo"" into rvc-dev...
Merge "Revert "Remove the usage of hidden APIs from NetworkInfo"" into rvc-dev am: a07b1974 am: 04cc000a am: 7a4e77ca
Change-Id: Ie2e535105f9cd6b3f469c4f0a54787135a44b581