Using FrameCallbacks instead of windowCallbacks for surface removal

WindowCallbacks is called during the draw pass, before the frame has
been sent to the surfaceFlinger. Frame callback will provide a closer
approximation for when the frame is actually rendered on screen.

Bug: 141126144
Change-Id: I62aab526c2ca24b00b5e7b312b36080f26c7b439