Merge "DO NOT MERGE Avoid path traversal in MediaProvider delete call" into sc-qpr1-dev