Merge "Camera: Clarify zoom and crop behavior for capture result" into sc-dev am: d3770297 am: c0217705 am: 7a6ead8c

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15194139

Change-Id: If5f7fb9b6139494bde48e12732c828bc17e00f2f