Merge "Modify AIDLs to include Session.Info" am: 78a63c1cf0
am: 9e4d4ee484

Change-Id: I9da7f4106bfec8ebba4515223a9dba40ffdaef20