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

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