Merge "camera: Drop pending preview for enableZsl shots" into oc-mr1-dev am: 69a74297cc
am: b4d8461d8d  -s ours

Change-Id: Ie08e2449fa654fb6b55cc2eb8c293f594817a809