[automerger skipped] AOSP/Music - Bug fix to provide a dummy handler for Intent.ACTION_PICK. am: c0d5256c10 am: f02bf16034 -s ours
am: 329ca7cbb1 -s ours
am skip reason: change_id I2917f9da6be509b654ce045db9f4d5aa1b73a752 with SHA1 c0d5256c10 is in history

Change-Id: I8d7f8e9aa9014366ae2d56cb6ffc995327ef62f8