Merge "HWUI: Finish frame callbacks before framecomplete callbacks"

libs/hwui/renderthread/CanvasContext.cpp

@@ -465,6 +465,7 @@ void CanvasContext::draw() {
         mCurrentFrameInfo->addFlag(FrameInfoFlags::SkippedFrame);
         // Notify the callbacks, even if there's nothing to draw so they aren't waiting
         // indefinitely
+        waitOnFences();
         for (auto& func : mFrameCompleteCallbacks) {
             std::invoke(func, mFrameNumber);
         }