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
Change-Id: I815499a43363327a55d0e0251c23eddde47afa5b