Revert "bluetooth map upstream changes from caf"

This reverts commit c3902f081d24491537f1b9f28fc518d820356ccb.