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: 377d13b3 am: fb9376ba
Change-Id: I277feec55bff74900c5f24f8c820635654493316