Extend SessionManager tests to include External Sessions am: ba049ae754 am: 6b270d41ca
am: 01583c1b3f

Change-Id: Ib5bf796e6174e06bd0cf29347b30e1432f0622ef