This reverts commit a27e1eef. Bug: 113554781 Test: FrameworksNetTests FrameworksTelephonyTests FrameworksWifiTests Change-Id: Ie1e84bd2a16f088307b195f924f4e49335cbe367