Merge "Don't crash system_server due to bad event time stamps." into udc-dev