Merge "Modify AIDLs to include Session.Info" into stage-aosp-master