Merge "Add Save and Restore of BluetoothOn setting" into oc-dev
am: e1a381cf41

Change-Id: Iced79a09a651676037718a6553cab7b16158ac14