am d3e4290c: DO NOT MERGE MTP and media provider support for multiple storage devices:

* commit 'd3e4290c0442b6dcf24bcf642f4fc26d12d8e7aa':
  DO NOT MERGE MTP and media provider support for multiple storage devices: