Merge "[SurfaceFlinger] Extend HDR support." into pi-dev am: 88428cd0af
am: 92b1f9afc4

Change-Id: Ifa9e277fa3f7ca5ad47b8ee5b5703f1c7733d949