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

Change-Id: I7b04f249de691f1499d3e2bbcbc93bf81d4fd1ea