Merge "Add Save and Restore of BluetoothOn setting"
am: bbcc641317

Change-Id: Ie967141aa0d8f43750f84fdd6071c26e0a26958a