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