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

Change-Id: I42bd7eb84dedc295a69e7174210a214d2ef96700