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

* dev/11/fp3/security-aosp-rvc-release:
  Fix URI check in BluetoothOppUtility.java

Change-Id: I0126c5cc1e8fa6e5fe8867a96ce091d6ab0795a1