serrano: Enable ZSL in camera app again

Change-Id: I6b5b2699a7d5fe51710b2fe33cf0ef6d48504558

Conflicts:
	overlay/packages/apps/Camera2/res/values/config.xml