Merge changes I00f0192b,I1db9269f into sc-dev

* changes:
  AudioTrack: Enable playerIId tracking for OpenSLES
  AudioTrack: Enable logSessionId for original proto