Revert "Bluetooth MAP (Message Access Profile) Upstream Changes (2/3)"

This reverts commit 6d4b1b1cf51394cd4791e0c4bacd2ba1a0fc9a23.