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 am: c5e03bef

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



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