Merge "Persist Bluetooth CoD config value across reboot"
am: ba45409c92

Change-Id: I4d28d0b1b52e587285d3b92b66fdc4b6c1b38720