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 am: cdfeccf0
Change-Id: Ida15cfd26ccbc0baca7bba9c9cf434827f1dd80e