[automerger skipped] Merge "Add SapProfile to LocalBluetoothProfileManager (1/2)" am: fce8595437 am: 6ac6aead0d
am: 61d67acde5  -s ours

Change-Id: Ib3a3feff813b6df565878474c29b0b97f9f28e62