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

Change-Id: Iccfe6a6854f9e22cdc5a5bcdafc4529116bc88bf