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

Change-Id: If1e6819430977bf3978bbbf23f0f32fcb1c460d4