Fix BT Query Routing Issue

During BREDR_TIMEOUT, we accidentally skip the BLE_ON state which is
important for broadcasting intent to external apps. This patch fixes
this issue.

Cherry picked from wear to reduce code divergence
Refactor fix to not be stuck in BLE_ON
Initial change Id was I8fd6c2f54b2bdae9b8a587c144424a976b6201d5

Bug: 263323082
Bug: 191828729
Tag: #refactor
Test: Manual
Change-Id: I8e35a574e8da7936bd1bf5073abfc5ed17b10bf9