am a38aaba2: am c160c231: am 48d707ae: am 26f7720e: Merge "MediaSession: Do not lock on AudioManager.getStreamVolume" into mnc-dev

* commit 'a38aaba22208af66deb387dc7c21e0308065fbec':
  MediaSession: Do not lock on AudioManager.getStreamVolume