Merge "Bluetooth: leave screen off for permission request" am: 172b01035d
am: 09f5638b92

Change-Id: I5af6b6f3d6463cd33c9074d31ba0e8c16eb6c9a7