Merge "Merge "SurfaceControl: Bind close-guard lifetime to native-object lifetime." into rvc-dev am: 26351d7c am: 4a0048f2 am: 4340f2f3" into rvc-qpr-dev-plus-aosp