Merge "mediaplayer2: allow prepare DRM in non-prepare states"