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 am: 2742b8a4

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



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