Merge "Add relative layer to SurfaceParams am: 6ec2f9151b am: f4e2405ad9" into rvc-qpr-dev-plus-aosp