Merge "Merge "SurfaceView: Avoid initializing Surface from an invalid SurfaceControl." into oc-dev am: 401b8907d0 am: 5482790a3f" into oc-dr1-dev-plus-aosp
am: 09fe1f8bbb

Change-Id: I8ca1c3e6e992a60705da57f54c84658c0c5dd430