Merge "Do not turn on Bluetooth when booting into Safe Mode" am: 34ed823dae am: 8ae1de7afe
am: 121bafc53e

Change-Id: Ibde604921565210e2e58b2ea02fd99dd8cd61c66