Merge "Merge "Fix typo in SurfaceControlViewHost relayout overload" into rvc-dev am: 22837609 am: a438c3b6" into rvc-d1-dev-plus-aosp