Merge "Modify AIDLs to include Session.Info" into stage-aosp-master am: aacbdf59d6 am: ccd8315969
am: 5cf582e74d

Change-Id: I348de54b56282d3a88e03671e2816425b953972b