Merge "CtsCameraTestCases: Add a timeout to the connection to ErrorLoggingService" into android13-tests-dev