Merge "Remove STATE_TOP_SLEEPING from foreground time" into oc-dev
am: e5fa4cd4b5

Change-Id: Ic54a96a1fe33a8e733762b40cd3c8a1751619ce4