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

This reverts commit e05139893e8bf2899c8202f9ba5915841cabf489.