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

This reverts commit 3247b09f6fd9e5d2ee80d0fcbe3a32186261137a.