Merge "Bugfix: Trimmed iPhone HDR file has wrong playback duration on Android device" into main am: 235d69d21f

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

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