Bug: 200697201 Test: atest android.view.cts.SurfaceControlTest Change-Id: I1d0cff355714acb5668952b3d7f6fc0c15952523