Revert "Camera2: Fix HDR and ZSL conflict"

This reverts commit 84a338105bcf799ed66c0b6341b15b30acb1dae7.

Change-Id: Ie90da9ec28bd780fe701fb966b0912f8e5d121af
1 file changed