Fix discoverability timeout issues. (a) implement timeout logic (b) persist 'never timeout' after reboot (c) code cleanup

Change-Id: Ia7a8611d7212b9201994034d17da1d18e106107b
3 files changed