Merge "logcat: test: increase retry on fgetLongTimestamp to 4, and sleep to settle to 3"