Merge "Camera: Fix ZSL_STILL_CAPTURE condition" am: 6491d72d01 am: 144f6546eb am: 13e7dc312e

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1944209

Change-Id: I493d92cf96813ddafd8d92bf82d10f822fc00df2