Merge "logcat: test: increase retry on fgetLongTimestamp to 4, and sleep to settle to 3" am: 7e51c66d86
am: 6d1cabbf57

Change-Id: I2b5b44f42da4463139e9f7e9394b161390d30ccb