Merge "Fix Photos crash when open 10-bit HDR videos" into tm-dev am: e3ebb21b am: 7ecdebae

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17816213



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