Prevent LE scanning apps from being wrongflully downgraded to opportunistic

Bug: 30648104
Change-Id: I9d749a20eefdbeb126fa25a425d636205a22b2ef

src/com/android/bluetooth/gatt/ScanManager.java

@@ -232,7 +232,7 @@ public class ScanManager {
                         Message msg = mHandler.obtainMessage(MSG_SCAN_TIMEOUT);
                         msg.obj = client;
                         // Only one timeout message should exist at any time
-                        mHandler.removeMessages(SCAN_TIMEOUT_MS);
+                        mHandler.removeMessages(MSG_SCAN_TIMEOUT);
                         mHandler.sendMessageDelayed(msg, SCAN_TIMEOUT_MS);
                     }
                 }