Revert "Correctly remember MAP access selection."

This reverts commit d85af55fdcd294209a0eb91d271c439c44d4cf6e.
Revert "Bluetooth MAP (Message Access Profile) Upstream Changes (2/3)"

This reverts commit 83b29b108b64166c91593fe83b48ec21385d3605.