Phone: support TLS as a transport method

Change-Id: I7f557db8f7c15d82735861af737447415cd50f21
Merge remote-tracking branch 'upstream/cm-10.2' into cm-10.2