Merge "Fix in SurfaceFlinger as HdrConversionCapability no longer used...

Merge "Fix in SurfaceFlinger as HdrConversionCapability no longer used Parcelable HDR" into udc-dev am: 31769c20

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



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