Promotion of android-framework.lnx.2.0-00046.

CRs      Change ID                                   Subject
--------------------------------------------------------------------------------------------------------------
1114849   I7cfb5654946299c6dd3d6b40e387aa999d9bd047   SF: Allow HDR for GPU fall back under certain conditions
1116342   I3689b19118c6c5c7114c41babe089e3f3452e8ae   surfaceflinger: Fix incorrect merge conflict resolution

Change-Id: Ie7ba25fe42bb0e67ac790fcce8c4b8b64f319057
CRs-Fixed: 1114849, 1116342