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

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

Change-Id: I6eb7d5a14afd14daafbf46b0567e3bb6bc520c5b