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