Merge "SurfaceFlinger: fix flakiness in IdleTimerTest"