Merge "AOSP/Music - Bug fix to provide a dummy handler for Intent.ACTION_PICK."