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

Change-Id: I6b6745eb558d664e1f17d5e808c66990cd0038eb