Merge "Fix MediaSessionCompat adjustVolume crash pre-API 21" into mnc-ub-dev