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

This reverts commit 76b9486d278796fe48b958c8c0f6e692814ed3fb.