Rejig watchdog by_status() query to make it faster

Bug: 1079093
Change-Id: Id57dd851d2c55070e27feec6556c39bcf85e0a2b