Merge "Remove access to the telephony manager constructors from SystemRegisteryService"