This reverts commit daf6c9e85b.
Reason for revert: Broken build 6513883 on aosp-master on errorprone
Change-Id: I5e473863c2669a3c89014e12cc952c5c72a12cb7
bug:157138919
1. Make them have "MobileNetwork" prefix
2. Also update WifiCallingPreference to remove its category
if it is invisible
Bug: 114749736
Test: RunSettingsRoboTests
Change-Id: I25871d579d6495e902e5583030889942ed2506a8