Merge "Camera: Clarify zoom and crop behavior for capture result" into sc-dev...

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

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

Change-Id: Ia104965e8dd6b3b5bd877ab06c1563435c6ab669