am 21c0800f: (-s ours) am d3e4290c: DO NOT MERGE MTP and media provider support for multiple storage devices:

* commit '21c0800f71c75d7bc38ca6dbc69fd8d10f175dcb':
  DO NOT MERGE MTP and media provider support for multiple storage devices:
tree: 26b259e6c7be68626372782b48ac15a168ff75f6
  1. camera/
  2. cmds/
  3. drm/
  4. include/
  5. media/
  6. services/