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

Change-Id: I8937ca129c29602e7506cb85dbc7c716c3c0e67b