Simplify handling discoverable timeout

Bug: 145171640
Test: compile & run
Change-Id: I896d25aa593b2c173c2a096bb8e1e81b00d1bb88
1 file changed