Merge "Merge "SurfaceControlViewHost: Respond to API feedback" into rvc-dev am: 1660402a am: a83723ad" into rvc-d1-dev-plus-aosp