Merge branch 'dev/11/fp3/security-aosp-rvc-release' into int/11/fp3

* dev/11/fp3/security-aosp-rvc-release:
  DO NOT MERGE Avoid path traversal in MediaProvider delete call

Change-Id: I3f7144ba6058e0dfb0ec616ee8f2adcd9ce74602