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

This reverts commit e7f60fef58f755788cd61aea8acbd9051f914214.