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

Change-Id: Icd422298d0d0372b969ce9cca481314980dc83d8