Merge "Remove Hermitian tone-mapping curve for HLG" into tm-d1-dev am:...

Merge "Remove Hermitian tone-mapping curve for HLG" into tm-d1-dev am: cb9f076c am: e2e7cf1d am: ad0d5314

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



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