[automerger skipped] [SurfaceFlinger] Add BT2100_PQ and BT2100_HLG color mode. am: d6fa4a70ba
am: e019298bbd  -s ours

Change-Id: Ie494f18327909e3f9389f9699d5c1735e5644d20