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

* dev/11/fp3/security-aosp-rvc-release:
  Validate ringtone URIs before setting

Change-Id: I54eadcc5f9075445f99c30ea65dc6726e395a893