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: c830a7f9 am: 46b3dc27
Change-Id: I2b9115d637f23090d79b637077bc805edc0adcbd