Merge "hal: Change device IDs of HFP"

#define FM_PLAYBACK_PCM_DEVICE 5

#define FM_CAPTURE_PCM_DEVICE  6

#define HFP_PCM_RX 5

#define HFP_SCO_RX 23

#define HFP_ASM_RX_TX 24

#define HFP_SCO_RX 17

#define HFP_ASM_RX_TX 18

#define INCALL_MUSIC_UPLINK_PCM_DEVICE 1

#define INCALL_MUSIC_UPLINK2_PCM_DEVICE 16