Revert "Revert "Enable device search""

This reverts commit 8ffdc4b6c4ae7f3fe10cd6e25a007c22fcbdeb99.

Reason for revert: b/183683148

Change-Id: I8429671f460e2ecbd187b8279aeed85009ffb334
1 file changed