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

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