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

Change-Id: I722b4e6c012b96612ede2c1d8a932a3da4773b45