Reverted data roaming leakage fix that causes side effect

Reverted ag/753579 that causes tethering not working in some
corner cases.

Test: Telphony anity tests
bug: 33847610
Merged-In: I061a706c3ed6b3255e39a33d0efa0d2f32af3120
Change-Id: I061a706c3ed6b3255e39a33d0efa0d2f32af3120