Merge "Persist Bluetooth CoD config value across reboot"
am: 914489de47

Change-Id: I6f435aba375098f76897641392b0555eb165c5a9