Revert "Revert "Settings: Enable HAL HDR+ by default"" am: 24721e7d96
am: c8d91c6066  -s ours

Change-Id: Id22341f5c7beb7112bf1fe378a4bd09ba47d3d81