Merge "MediaSession: Do not lock on AudioManager.getStreamVolume" into mnc-dev