Merge "Allocate/free the SDP connection timers only during stack...
Merge "Allocate/free the SDP connection timers only during stack startup/shutdown" into nyc-dev am: 57b0a86d am: 24e4c6b6
am: 29705dc2
Change-Id: I5886739b7b43393889deceb48b03b267fd82851d