Merge "Add API 23 PLAY_FROM_URI support to MediaSessionCompat" into mnc-dev