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

Change-Id: I1f68972abd02d6eea4c4d45e96261a3c64a867f7