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

This reverts commit a130f0e738dbcffc9b550d288f3fe6dfd39f6aaa.