Merge "Revert "create getModemEnabled function in PhoneConfigurationManager""