Merge changes from topic "revert-28899062-frame_duration-AERRFOIUUY" into main

* changes:
  Revert "Add the expected and actual frame duration to the SF jan..."
  Revert "Use the expected frame duration from SF instead of HWUI."