Revert "Fix coding style."

This reverts commit dda63a8d2902ee12a2f2a9ee42f974fa1502aaaa.
Revert "Bluetooth : Remove out of range devices after ScanComplete"

This reverts commit 6c35d82549233a062fb9e30176ceec26a89fa165.
Fix NPE when cancelling the shortcut picker.

Change-Id: Id58410b5d5e99fe8361d21cec6ee3d15f382256c