am b37fcbfd: Merge "Added getter for session Id to AudioSink" into gingerbread

Merge commit 'b37fcbfd7f9d65b90b43e0242903030c5a6517b5' into gingerbread-plus-aosp

* commit 'b37fcbfd7f9d65b90b43e0242903030c5a6517b5':
  Added getter for session Id to AudioSink