Merge "Merge "surfaceflinger: fix initial crop computation" into oc-dr1-dev am: 349abaf5 am: 1e2c743c" into oc-mr1-dev-plus-aosp