Revert "Don't call cancel discovery when its already canceelled."
Revert "Don't call cancel discovery when its already canceelled."

This reverts commit 58d0dcb75b776bba0737412d2f5e203792b06a52.
Fixes a bug where discovery would start every 20-30 seconds.

xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base