Refactor following CFG_WMI_WQ_WATCHDOG cfg items. Change-Id: Ib65c6cda2a2574940604e8b67bc29a6749add842 CRs-Fixed: 2357070