Merge branch 'security-aosp-tm-release' into int/13/fp3

* security-aosp-tm-release:
  Fix path traversal vulnerabilities in MediaProvider

Change-Id: I1215d22e58e498c04f1230f5b1f0caaa308b6a68