Merge "Merge "SurfaceFlinger: Add mode to apply position with resize." into nyc-dev am: c3da482bb8 am: 34703b94e1" into nyc-mr1-dev-plus-aosp