Reland "Add timeout logic to TestWakeupClientServiceImpl."

Fixes a type issue where uptimeMillis returns in64_t not long
type.
This reverts commit cd8b3861.

Test: m -j TestWakeupClientServer
forest run on aosp_x86-eng target which failed previously
Change-Id: Ifc51cbe80787b0ecce2ffe42a2888962a8d9f941