Merge "Add SapProfile to LocalBluetoothProfileManager (2/2)"
am: 7e77a49086

Change-Id: I7ac82e653c9d5f4da4fb1536727e521305466d34