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

Change-Id: Ib7e61f66b52525d59fc8fe111124b859ddc52e04