Merge "libmediaplayerservice: unlock before trying to reclaim drm session." into mnc-dev