Merge "SurfaceView: Fix missing override for SurfaceControl proxy" into oc-dev am: 42b3610adc
am: aec6b4749a

Change-Id: Ic8bbda9b2fc76253c70e9f5cd15d6a32b212b50d