[automerger skipped] Merge "Opp: Use MediaStore to handle received file" into...
[automerger skipped] Merge "Opp: Use MediaStore to handle received file" into rvc-dev am: 1d9750b6 -s ours
am skip reason: Change-Id I45b6fdb7ba7957d19ce3bf92c6c36711c8433c09 with SHA-1 27980742 is in history
Change-Id: I93971c9732ab799d35ab810de263311b7a957733