This change also remove some unused references.
Bug: 136638851
Test: atest android.net.cts.ConnectivityManagerTest
Merged-In: Ic44b31ed9acc48b9bcba7e1e70cc18a65bc0a8f6
Change-Id: Ic44b31ed9acc48b9bcba7e1e70cc18a65bc0a8f6
(cherry-pick from ag/8500407)