am: 59a6ab43 * commit '59a6ab43': Add setOverrideScalingMode to SurfaceControl Change-Id: I45289edd16cf3b94b9b3c082c26315ebb6dfc638