Merge "[Telephony Mainline] Refactored ServiceManager calls"