Merge "[SurfaceFlinger] Fix HDR tone mapping." into pi-dev
am: c1bb0157ee

Change-Id: Ia4d7d07d220c5ab44814501341e5a51ff98740fd