camera: Enable ZSL

Restarting preview if toggling ZSL fixes the stream errors on
switch, so we can enable this now

Change-Id: I07ceeed859ffa6dc4e75faed18209be83c21a043
ril: Use proper state value to determine SIM ejection

The SIM_ABSENT constant doesn't match the CardState enum, so use
0 directly for CARDSTATE_ABSENT

Change-Id: If8d7069507b30fe419b8d4f304a2db957d059ca5
Merge remote-tracking branch 'cm/cm-11.0' into HEAD

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

Change-Id: I2a4e3dfe157b6e579a947028adb6df3c7e0a7088