[automerger skipped] Merge "Add SapProfile to LocalBluetoothProfileManager (2/2)" am: 7e77a49086 am: 05c71fe75f
am: 751d2bf44d  -s ours

Change-Id: I6cc82821e6defca02a2cb660614ae2dda9ce1340