Merge changes from topic "am-85dda005ca6342199835b5ce487e1702" into pi-dev-plus-aosp

* changes:
  Merge "Add SapProfile to LocalBluetoothProfileManager (1/2)" am: fce8595437 am: 6ac6aead0d
  Merge "Add SapProfile to LocalBluetoothProfileManager (1/2)" am: fce8595437
  Add SapProfile to LocalBluetoothProfileManager (1/2) am: 2be42b972c