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

Change-Id: Iacaec4a48a45935a49576c140ea11ea3d0da6361
1 file changed