Merge "AOSP/Music - Bug fix to provide a dummy handler for Intent.ACTION_PICK." am: 087a529f86 am: 7b4df92bcd
am: 42dd047fac

Change-Id: Ie104c78d101975d99d096a7f2d5cf1f64f69f70f