Merge "[SurfaceFlinger] Add HLG simulation support." into pi-dev
am: 4693e7370e

Change-Id: I54f3a952dc613a3ade8b869170cd9649c813c03c