Merge "Fix TimeDetectorServiceTest permissions"