Jonathan Hart

Rafactored PeerConnectivityManager for code reuse between the two path types.

Change-Id: Ib05f676d071ef1c545e93244a9ed5ed89672113f