Merge "Modify AIDLs to include Session.Info" into stage-aosp-master
am: aacbdf59d6

Change-Id: I272539ea7124fa18e42ee6f06c89d3ffca449934