Merge "DropBoxManager: Allow adding a file using an fd" am: a946cc9f53
am: 71411b877a

Change-Id: I8c07b8650a508f03352075ac7bd6e7943f6cacb4