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

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

Change-Id: Icb1b65c8a923f4a84d9fe6fdf4652459c595418e