Merge "Modify ConnectionServiceAdapter to include Session" into stage-aosp-master
am: def235760e

Change-Id: I309cd302b14ee0d0980632086855ba2cf97c6798