Merge branch 'dev/10/fp2/security-aosp-qt-release' into int/10/fp2

* dev/10/fp2/security-aosp-qt-release:
  Fix URI check in BluetoothOppUtility.java

Change-Id: I9d9a571b9d93dfe41a18cfca4858fea4f8ce8152