Merge "[CTS] Fix RestoreSessionHostSideTest" into qt-r1-dev am: f53b85e12e
am: 0afc5d9e6d

Change-Id: Ie705b683b55b92f3b431fb6e3842a47540cfc4a6