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

* dev/11/fp3/security-aosp-rvc-release:
  Fix path traversal vulnerabilities in MediaProvider
  Canonicalize file path for insertion by legacy apps
  Remove invalid surrogates during bindSelection

Change-Id: I9581c7e5c1889e93f4fc068a2eff6bc5d43c4d0a