Merge tag 'android-security-13.0.0_r9' into int/13/fp3

Android security 13.0.0 release 9

* tag 'android-security-13.0.0_r9':
  Canonicalize file path for insertion by legacy apps
  Remove invalid surrogates during bindSelection

Change-Id: Iff1af1fa90cd0f944cc0f7b9f3809c28c750f7f2