Revert session-transfer change

This reverts:
5d74493f64493cd506d7458b810095259287f623
94deaf7725c418ec1950d810ab86f0d157ddf518

Bug: 64467704
Test: none, 100% revert
Change-Id: I6534c19c594dadfa41457725988485a67f0ed45f
7 files changed