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

Change-Id: Ic56c499e6c0aee627983091f5146af5c3a84bd80