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

Change-Id: I4d9b66c81f4f9fbebeacd9aede566f660c4b1bb8