Merge "Include pending media as well when deleting mediastore entries." into...
Merge "Include pending media as well when deleting mediastore entries." into rvc-dev am: 442399b1 am: 1f5e28c9 am: b828ea88
Change-Id: Icc055932724f672754bb07c4d7c71cd5dd09563e