Merge "Revert "Bugfix: Trimmed iPhone HDR file has wrong playback durat...""...

Merge "Revert "Bugfix: Trimmed iPhone HDR file has wrong playback durat..."" into main am: db12f549

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/3099398



Change-Id: Iec16234fdd2bdd6eb6430678cb519259aa927960
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>