Merge "Fix timer bug in TrustManagerService." into udc-dev