Merge "Modify AIDLs to include Session.Info" am: 9ded71c328 am: 1562bbbac2 am: 6b87559f19
am: 7faa6a61ec

Change-Id: I3676bd2fde1522efb99a3089b7c47dc9040e217f