Revert^2 "Modify Tests to make SessionManager final for tests"

6c7c4a9613a3514aa94baba23e941b370d9e96ab

Change-Id: I9faaa634f490d6b25c870be37807cc0601432934
2 files changed