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

Change-Id: Ib4246192ed3f854a94a33d972616d6b1d9de5d9c