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: 49cf50ae am: f5f2b98b
Change-Id: I504020913aca72138b00dd2e04553e974e007adf