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