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

Change-Id: I4a0d1e8cc4f879896c3029a8f871d794362e0bca