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

Change-Id: I5ffb4bff8fa293eb570d96d09ccc633423e1e76f