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: ba65c39c
Change-Id: Ic0da47dfb262b567e7cc55e7349607890a046652