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

Change-Id: I50ddaa6a5d849f7a32a9d7b921cf41c566101426