Merge changes from topic "apr10" into sc-dev

* changes:
  Update Bluetooth API annotations.
  Error Prone for RequiresPermission across AIDL.