Merge "Bluetooth MAP (Message Access Profile) Upstream Changes (3/3)" into cm-10.1