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

Change-Id: Ifcde47987da1aadc3e7b11567fa5f3b6efa7cf66