Merge "[automerger skipped] Merge "Add SapProfile to LocalBluetoothProfileManager (1/2)" am: fce85954 am: 6ac6aead am: 61d67acd -s ours"