Merge "SystemServiceManager: Change from wall time to boottiime" into oc-dr1-dev am: cf70671a75
am: dc458c33d6

Change-Id: I0068e1d5d869002d140d66f86117aa89a0b05456