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: I072e4053ceb1652d2c3264fdd54b668de4842292
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>