Merge "Add setOverrideScalingMode to SurfaceControl am: c3574f7b am: 59a6ab43" into nyc-mr1-dev-plus-aosp